Some graphic bugs fixed