Sticky arrows and some dealocation changes