Reorganized TODO's
Fixed typo's
Made code safer
Added some documentation
forgotten bit of parameterized/formatted messages support