clean up, some corrections