Bug fixes

Cyperh.cpp didn't actually work as far as I can tell. Now it seems to