minor optimization
repaired one very awfull syntax
remade extending of default options to be more readable