Have done some changes, mostly costmetical