Added multiple properties and fixes