Fixed some errors, and some 'possible' errors.