add all graphics and small bugfix