Tweaks to stuff, needs work.