2 years of bugfixes