Various additions and improvements after fooling around w/ node