merged in crap app fixes