more stupid bug fixes