tweaks - removed commas at end, etc.