Additions & Fixes.