fix a few more things
initial release