v2.1.0 working version

See changelog.
More updates planned tonight (config file!)