Bug fixes and improvements, add few imgs