Making changes as instructed by Sebmaster
Plus some other minor stuff.