Minor Fixes

One or two small bugs fixed, some vestigial code removed...