completed edit&delete functionality, fixed bugs, added comments