removed debug messages and prettied up screens