fix bug in name in .info + restructuring form functions