add comments and other things
nt needed anymore
change title
fixed merge conflicts