bug fixes :3