Added some few final touches.