various changes
after merge due to pull
minor changes
resloved merges