cleaning up

and small changes