Added location section and other enhancements.