Bugfixes
Form Validation