Most of Graphics/ cleaned up.