OK-514
fax minor bugs
OK-513
fix tumor view
merge with master