minor changes on maintenance