To much changes here to commit on everyone..
hopefully the comments are ok, but if desired,
i'll commit on every change in detail tomorrow!