shape improvements, cleanups, material improvements