General updates and bugfixes