active edit 20% & fix other bug