More pricing stuff / calculations + some cleanup
Merge pull request #45 from seavor/polina

More pricing stuff / calculations + some cleanup