fixed some names, added specs for all.