fixes, improvements, etc