Edited various todos,