added user xml exporting options + fixed some logical errors