tightend it up.
Update
Still needs some tweaking but worth backing up now.