Edited rounding in various places
Merge branch 'beta'