added editing and few minor fixes, still bugged