Yep..

More minor changes, that will more than likely be changed again by me,
but here we are.