Multiple fixes, improvements