allow user to decide about enforcement
minor changes
grappler and hooks positioning
cleanup