Done some tests, seems mostly fine.
Moved a comment...