deleted cruft, couple minor fixes