Add resources, make style fixes