better parameters and some fixes