updated a lot of stuff, esp. properties