Changes to models and blade variables, ect to resolve bug issues