Now compiled against android 5.0; more cleanup including win detection