fixes and updates, new abort method