Fix issue 10, 14, 13.