bemese/master merged, first draft complete

Changes from bemese/master have been merged into master, and new changes committed.

Seems like this first draft is done. Next: correct english and additional formatting.