Additional features, bugfixes

Running list of commits