more tweaks and content addition
fix conflicts