Updated specs and refactored some methods
New build