removed brace highlighting
fixed for basename without -s option
added todo