combining node and angular
fixing bugs