Dev tools progress; misc tweaks