7x25: clean up + fixes