Minor fixes, need a normal IDE for android (lol)