Added location, stamp fields and more reg ex