Bug fixes and new images