Bigfixes and few comments