Minor updates, improvements and bugfixes