Validations refactoring, bugs fixing and minor functionality changes Closes #48 and #55 See merge request xkridl/pv168-project!36