Updated bootstrap
Fixed todos target