Various fixes and added images