Tons of updates and bugfixes