Made a few improvements, just uploading so I can access from my dev machine later.