small changes
utils: better input type-check
whitespace