issues 33, 34, 35 fixes.