Some bugs are fixed!