Update form added

Made some bugfixes