Corrected some get/set functions