RC2 - Release Candidate 2

Grafix update, cleanup