Fixed some bugs and added addition get methods