added more properties and global munging