adds
some fixes