inspect fixes
merged olles interface classes into develop..