Simplified shape functions and fixed Windows upload bug.