Fixed an editing bug, implemented the final mandatory user stories