Some more small changes! :)