Bugfix & Image Update