bug fixes round 3~ish