variety of fixes for my stupidty