Final Touches and enhancements