More bootstrap updates
Model fixes and stuff