devcode backup

fixing bugs