refactoring
refactoring
rename
several corrections and improvements
work on missing parts
cleanup