Updated edit class, other minor changes