Minor cleanup/bugfixing and new images