added oaff features, fixed bug

Summary: Change-Id: I9fcd55c60db2452551978b826c4f2c16a4b106d1

Test Plan: check

Reviewers: cprodescu

Reviewed By: cprodescu

Differential Revision: http://phab.code4fun.de/D24

Change-Id: I1d64dacdf0076de8d50f2e2c79d5fa467e045018