Bugfixes and changes over the last couple of months