completed issue 1 fixes