Rebased branches (commit-collection)

This is a pull request that collects all working branches to one for review.

Has fixes and implementations for

#65 
#259 
#181 
#206 
#89 
#172