Added new instance forms; fixed some infrastructure