support for multiple vars in using statements

also bug fixes/code cleanup