attempted normal map, other small changes
merge conflicts