some other lil improvements