* Bugs: minor bugfixes to put this thing together