Some small decorations and fixes