a lot of corrected things