fxml update
error handling, popups, code cleanup