resolved a few todos, fixed an error