some more changes, still no testing, lag may make this impossible