info fix + fix names