Small fixes, made example args more agnostic