[@Surtr Inc] Fixed issues - anything else?