misc improvings