specs, clean ups
added more specs