ticket:4 fixes implemented