still fixing errors