fixed up some issues with residue from the specs