Fixed npe in holders, refactored to int location coords
Minor fixes
Merge remote-tracking branch 'origin/dev' into dev