Bug fixes and screenshots