Message is now stored in the database. Minor changes