Latest changes, done for the night :)