working on fixing errors