Some more improvements, fixes, typos