new and edit bugs (hopefully) fixed