New version

Newest version of code, new images, some bugfixes.