fixes (again) and statics move