Fixes for more of the same problems. LOL.