various bug fixes, minor additions, more silliness