fixed wrong quotes usage
enhanced sourcing aliases