bug fixes and stuff...