minor AK changes

Some minor mods to Ak workflow.

NOTE: I really bothced this MR last night and spend some time trying to undo things....probably shouldve waited to the moning.

I have comments in the individual MR, but just look at the changes summaries and see if everything makes sense.