finally deve fixes