added commando options, bugfixes