Bug fixes and fixed a lighting regression.