General improvements; buildinfo