Minor bugfix, add todo to list remaining bugs on this branch