Fix bugs found during use.
Cut incomplete modules.