tried to fix some errors