Fixed issues 14, 12, and 11