A few more specs; more documentation