master: a-0 better error checking added new screens