several fixes; android finally works