Dev. checkpoint: Touchups.
Improved: setting default values.