Fixed a dependency issue. Also added to todo's some items that don't have tests yet.