Added some getters and stuff.. generally cleaned things up.