Form and small changes