Couple Fixes & Work on Binniemods