Minor EOL adaption
Basic working state to support Share
Misc changes / fixes