cleanup, added bash completion