added some todo elements and som more comments