manager.py tweaks