added a few more specs. i feel a refactor coming up...