Lots of new tweaks, seems to be working great