Added ATPA overlap control methods

Also some small fixes and tweaks!