Added some more goodies and spelling..