fix fixtures.js and finish activity model