addressed two bugs