Fixed parsing of "1.foo" in bootstrap
Continued bootstrap parser