Save rounding for the end, misc. syntax fixes