fixes #132
fixes #133
fixes #134
fixes #135
fixes #136
fixes #137
fixes #138
fixes many bugs on models and fixtures