Restricted joins, added some new settings for users in notes