working
some fixes