Improvements, Adjustments, standard fixes