still fixing error messages