bugs fixed and new features