fixes, improvements