major code cleaning + some bugfixes + now using spork to speed up rspec