Graphics and bugfix