Pythagoras v2.0

Miner edits, Exit virker.