Fix tabs; update aliases