Done with two more small categories
Fixed a couple of bugs