cleaned up errors
needs work