Updating and bugfixing