Did some small changes