Add Dylan support and minor cleanup