Fixing errors and adding get methods.