Global re-factoring.
Bug Fixing.