Cleaned up errors to get master functional