Bills aimed at making schools safer