Build 37 Hotfix

Sorry it took me so long, but fixed issues at the beginning and unable to proceed.
check it the fixes here.