refactored uniform spec code + minor lighting