added android and html versions, fixed some control bugs, general cleanup