more fine-tuning, some mobile stuff