changed output and commented a little | some things are still missing