some fixes to behviour