alerts + minor changes + testing