Fully fixed issues 11, 12, and 14