fixing bugs and cleaning up mobile