added consts for the form limitation, doc blocks fix