Changing some details re Flyby planning (Fixes #22)
Updated some lock stuff