fixed various issues and removed unnecessary options