Minor fixes, added classes.