fixed js stuff and included android fix