edit and execute done. fixed small bugs.