Fixed missing objects.py - further improved mode switching