stuff
updated some stuff
add rating functionality improved
merged