Fixed miscellaneous todo's.