Additions and fixes to modules and property list