fix bootstrap for console & rake commands
remove todo