Fixed some details after a first look