some updates, edit is not supposed to be working yet