Client revisions 2

pass through ost map directive, some fixes and refactorings