some changes
help added + renames + other changes