Working on fixing any bugs

Just woke up
Merge branch 'master' of https://github.com/TheDrunkMafia/MobileBase