fixed somethings.  hopefully I didnt break anything, will try on a few apps