Removed debugging statements and improved text on screens