added ASA references, removed TODOs