Minor behaviour fixes, added Objetify script.