Fix presence validator, better magick defaults and simplier code