removed cruft
fixed some bugs