small modifications
Merge branch 'csf' of https://github.com/micksi/med603 into csf