Also minor fixes on comments and make a set of base categories for faster lookups
Attach a file by drag & drop or click to upload
