Added remove functionallity, fixed save errors