Fixes an exploit and tweaking some things