fixes to base.py
Fixes to combinational.py
Merge pull request #235 from debugger22/misc

Miscellaneous fixes based on landscape.io