done some more stuff