Various fixes and new cowboy option