Further bugfixes and updates