Bug and some editing