Misc Manual Additions