a few bugs and such