a lot fixes