Small changes and improvments