Bug fixes, additional switches.