Added quote support, tabs to spaces, fixed alignment