updated makespec, some cleanup