Improved and 1 bug fixed.
Improved and minor bugs fixed.