Adding some more stuff, commented things wheich were giving unsual bbugs for android