Minor bugs fixes and screenshots added