Rebuilding on a new machine, updates, small fixes.