Bug fixes, and added &aux parameter parsing.