added todos, improved coverage