code editor bug fixed
small fixes
merge