Tweaks, add some things, remove some things