merged w/ axdcc-merge branch, fixes for resume