Many improvements.. :)