cleaned up specs
fixed some line lengths and refactoring
removed broken stocker functionality
whoa. fixed some stuff, added tests, refactored here and there.
merged in master