Fixed a couple of bugs and missing setters.