Implemented @440, 441.
Warning fixes/documentation.

2 files changed