added more specs; refactored
fixed routes