Minor Fixes & Additions