Form and readme fixes, better code re-use