Cleaned up top and changed to new messaging system.

Also fixed missing eof newline.