init
some fixes