MDF3 week 3:
Fixes and minor improvements.