fixed some statics
merged