updates for simplification and mobile stuff