Minor drawing improvement.
Fixed bugs due to new structure of global environment.