Added fixes and content according to the comments by Balázs.