Add a few properties, tidy a few things