Updates and tweaks after feedback