Adding some assertions and corrected description in Keys

Closed the last one too fast ;) #35