marked experimental stuff, add switch for bash completion