Moar

+ Update comments
+ Add a couple of tests