a few angular optimizations, working on more content