massive minor changes...