added changes to hard-coded stuff from nodejs branch.