bunch of changes, since I haven't committed in a few weeks