remove trailing commas; interface tweaks