Added some more Week 6 stuff, also cleaned up Hallo and Words code a bit.