probably just some minor fixes