some updates to make it more to my taste