lots of fixes
change settings and fix wait states