fix some TODOs
fix pressure normalization
add test