article entity reverted 
- some minor fixes
- clean up my mess