using 1.8.2, adding properties, cleaning up a bit