Added some getters and setters, improved doc comments