fixes, improvements, dinge