Minor update and bugfixes