added new shared includes, improved settings, updated common lib