Geometry fixes, android makefile
Lighting work