Finished Update and comments functionality