Several BUGs are fixed!