Libraries updated, models cleaned up a bit, js structure fixed a bit