fixed some errors, created new ones