Removed TODO
Added missing dependencies
More to skip
Updating for next release