Minor changes, fixing labels, etc.
requested review from @lavamind
assigned to @gus
mentioned in commit e65100df
merged