fixing some bugs and making crud work for activities as well