Completed Honeycomb qualifier. Other minor fixes