updating and doing a little housecleaning