some latest fixes