Yet more amount fixes, handles 0 correctly now