Add deployment; Minor fixes