Many small changes