clean up some stuff and update Picture class
took out rating from model