Fixed some bugs involving defaults and resetting; added the black/whitepoint indicators back in