Lots of bug fixes, two new classes.