Some smaller changes all over..