Updates and fixes after feedback