Many fixes and enhancements also more work on targeting.

Requires edubart/otclient@0b5654f +