fixed issues with empty arguments and multi word arguments