Updated Android code, Bug fixes