remove forking, misc spec improvements