Fix bugs and add ls colors