Cleaned up first 7 problems