added some TomDoc
updating some structure