Some changes / improvements