Bringing Jar up-to-date
General cleanup