Applied AlertService as a Thread / Minor fixes