- Some bugs fixed