Polishing + Fixes + New Features