bugfixes + images added