Ks commit 8

fixes according  comments of code review
not all