Fixes and improvements after twidi's first review