minor fixes
refactoring crud directives (WIP)