Added aliases; fixed quoting