Corrected assorted errors