lots of changes making things more application factory friendly