Async deploy and small cleanups

Rebased the work from friday onto your latest changes so it should be mergable.