testing and various adjustments