Tweaks and moving stuff around