bunch of small changes