Merge pull request #17 from davidtrem/oefwork

Prepare for oef work + few fixes