added some screens and removed some warnings
Merge branch 'traveller'
Merge branch 'master' into traveller