Optmization...
Bug Fixes.