Fixed a bug with status messages. Next: Test more