fixed status messages and cleaned up