Improved Parameter Detection

Improved Parameter Detection for almost all commands.