Updated to do list, other small bugfixes.