updating imports to new angulillos dependency plus a few minor fixes