deleted some fixed I'd commented out, either because they weren't needed or because I implemented them and they were already there.