Article types rework
Merge!
Fixes