Old TODO additions and bugfixes