Fixing exploit + fixes to redstone-logic