Just lots of bug fixes