more progress
merge develop
more prgress
fixed merge conflicts