First go at outputting messages
Minor changes