lots of updates and bug fixes for mobile