Subject fixes

[winstonallo]

• [x] #132
• [x] #91
• [x] #100
• [x] #109
• [x] #110
• [x] #119
• [x] #128
• [x] #131