cleaned the shit, added android