puma overlay
lotsa cleanup