continued editing
Questions part v0.1
merge conflicts solved