Added better support for building starting. Improved scanning

This does not actually work better yet, but has some imporovements
under test.