mobile & validation adjustments
merged with master