More FormSet stuff and a fix that closes #27