manual improvments