bugs on dev server fixed