A little bit on Rspec and a few TODO things...