basic fixes
Merge branch 'master' of https://github.com/Sloth6/Beacon