1: misc tweaks, preparing for more changes...