Some bugs fixed!