Small fixes, improvements