bug fixes round 1