a ton of tweaks and adds yo