I think it basically works now, so marked it as such, need to test more tho so might end up unmarking it again later.