develop: add few improvements