more fixes, remove skipemailscreen for now (causes bounds errors)