more fixes and tools