minor changes. whitspace mostly