lib tweaks
lib tweaks
model tweak
Model and view updates