resolved conflicts, added some more documentation to the OOB stuff