android depndency and other minor fixes