Lots of bug fixes!