fixed associations issues and some typos