Resizing, renaming and minor fixes