Bugs fixed and improvement!