Addressed most of the comments in https://critic.hoppipolla.co.uk/showcomments?review=461