Additions & refinements.