added edit fxn and some other goodies