bower and build fixes, model micro optimisation