bug fixes, it's getting serious out here