A Bunch of bug fixes.