fix alertify and bugs