Added form numbers validation + some bugfixes