- Minor bugfixes
- Added some validations