Merge pull request #64 from lambdabetaheta/overhaul

Further overhaul -- reached a little into weak equivalences