lots of bug updates