Minor improvements to code & fixed some reversed face declarations.