Some minor contributions, now that I'm using this for @FitmobApp