some changes for deployment
stuff mostly works in deployment
Merge remote-tracking branch 'origin/master'