Issue #40, fixing pyc's and regressions.