Updates, Improvements and more de-kludge.