more fixes and tools page