removed sanitazion related stuff, added action callback
work on option processing code