user fixes, removed cruft