lots of aged bugfixes