More changes/work on toxav