Fix some discrepancies w/ layer json
Fix some typos