done + rebased.  Let me know if there's anything else :)