added screens & cleanup