fixes from previous thing