attempting bug fies
bug fixes round 1 complete