Cleaned up some stuff and added timestamps to messages