playing around
some fixes