Several improvements after first deployment attempt