Implemented multiple updates, fixed bugs