Fixes!

Fixed a problem where 0 was passed in for an argument, it would revert
to 1 in some places