Minor corrections plus introduction of defaults.py