some fixes
add new files
change multiple structure elements