okay we are really doing it this time

fixed some crap ...